-
Notifications
You must be signed in to change notification settings - Fork 13.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add __isPlatformVersionAtLeast
and __isOSVersionAtLeast
symbols
#138944
base: master
Are you sure you want to change the base?
Conversation
This PR modifies cc @jieyouxu
|
__isOSVersionAtLeast
and __isPlatformVersionAtLeast
symbols__isPlatformVersionAtLeast
and __isOSVersionAtLeast
symbols
This comment has been minimized.
This comment has been minimized.
3908474
to
721f8eb
Compare
r? @tgross35 |
Happy to review the implementation, but @Amanieu mind confirming you are okay providing these symbols from |
721f8eb
to
a0061ac
Compare
This comment has been minimized.
This comment has been minimized.
Allows users to link to Objective-C code using `@available(...)`.
a0061ac
to
19cccaf
Compare
Based on findings in rust-lang/rust#138944, we were previously incorrectly falling back to the product version of the host system.
It's a bit of a grey area since it's not clear how much it is Rust's responsibility to provide builtin symbols that are only used by C code. Arguably the more "correct" approach is to tell users of C code that we only provide symbols for Rust code and that they need to separately add a dependency on libclang_rt or libgcc, but that is a lot of hassle and thing usually just work without it. I'm not opposed to adding this in libstd for now, but it might be worth looking into a better story for how to handle builtins that are needed by C code but not Rust code (e.g. emulated TLS, clear_cache, enable_execute_stack, etc). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some initial comments, I still need to take a closer look at the version_from*
implementations.
@@ -0,0 +1,15 @@ | |||
int foo(void) { | |||
// Use some API that's a lot newer than the host | |||
if (__builtin_available( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For my understanding, does linking currently fail if we don't define __isPlatformVersionAtLeast
and __isOSVersionAtLeast
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup. Commenting out __isPlatformVersionAtLeast
fails with:
error: linking with `cc` failed: exit status: 1
|
= note: "cc" "/var/folders/0j/tk3sfgz540712zgqd1hrry0m0000gn/T/rustcddlAYt/symbols.o" "<2 object files omitted>" "<sysroot>/lib/rustlib/aarch64-apple-darwin/lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,libcfg_if-*,liblibc-*,liballoc-*,librustc_std_workspace_core-*,libcore-*,libcompiler_builtins-*}.rlib" "-lSystem" "-lc" "-lm" "-arch" "arm64" "-mmacosx-version-min=11.0.0" "-L" "$BUILD/aarch64-apple-darwin/test/run-make/apple-c-available-links/rmake_out" "-o" "main" "-Wl,-dead_strip" "-nodefaultlibs" "foo.o"
= note: some arguments are omitted. use `--verbose` to show all linker arguments
= note: ld: warning: object file ($BUILD/aarch64-apple-darwin/test/run-make/apple-c-available-links/rmake_out/foo.o) was built for newer 'macOS' version (15.2) than being linked (11.0)
Undefined symbols for architecture arm64:
"___isPlatformVersionAtLeast", referenced from:
_foo in foo.o
ld: symbol(s) not found for architecture arm64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
@@ -0,0 +1,12 @@ | |||
//! Runtime lookup of operating system / platform version. | |||
//! | |||
//! Related to [RFC 3750](https://github.com/rust-lang/rfcs/pull/3750), which |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cc RFC author @ChrisDenton just so you know this module exists
//! In Rust's case, while we may provide a feature similar to `@available` in the future, we will | ||
//! probably do so as a macro exposed by `std` (and not as a compiler builtin). So implementing this | ||
//! in `std` makes sense, since then we can implement it using `std` utilities, and we can avoid | ||
//! having `compiler-builtins` depend on `libSystem.dylib`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you mention why we need this as an extern
symbol now, before we have the public API?
This would also be a good place to clarify that we aren't making any guarantees about the availability of these symbols and it's possible we remove them in the future for whatever reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you mention why we need this as an
extern
symbol now, before we have the public API?
I've rewritten the section a bit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Making guarantees about the availability warrants discussion though: Let's say I went and removed this code from curl-sys
after this PR lands. If Rust later removed these symbols, users of curl-sys
would encounter linker errors again.
That is, without some sort of guarantee of the continued availability of these symbols, they're basically useless.
What are your thoughts?
// SAFETY: The signature is the same as what Clang expects, and we export weakly to allow linking | ||
// both this and `libclang_rt.*.a`, similar to how `compiler-builtins` does it: | ||
// https://github.com/rust-lang/compiler-builtins/blob/0.1.113/src/macros.rs#L494 | ||
#[cfg_attr(not(feature = "compiler-builtins-mangled-names"), unsafe(no_mangle), linkage = "weak")] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the compiler-builtins-mangled-names
config here? I don't really know why that feature is exposed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure actually, I just sorta tried to make it do the same as what happens when using the compiler_builtins::intrinsics!
macro.
Perhaps libstd
can be compiled with compiler-rt
instead, in which case we wouldn't need to export these symbols?
Thanks for the review so far. I've answered or fixed your comments in separate commits, to make it easier for you to review (if you're already halfway through a second review). I can squash once everything is ready. |
Motivation
When Objective-C code uses
@available(...)
, Clang inserts a call to__isPlatformVersionAtLeast
(__isOSVersionAtLeast
in older Clang versions). These symbols not being available sometimes ends up causing linker errors. See the new testtests/run-make/apple-c-available-links
for a minimal reproducer.The workaround is to link
libclang_rt.osx.a
, see e.g. alexcrichton/curl-rust#279. But that's very difficult for users to figure out (and the backreferences to that issue indicates that people are still running into this in their own projects every so often).For another recent example, this is preventing
rustc
from using LLVM assertions on macOS, see #62592 (comment) and #134275 (comment).It is also a blocker for setting the correct minimum OS version in
cc-rs
, since fixing this incc-rs
might end up introducing linker errors in places where we weren't before (by default, if using e.g.@available(macos 10.15, *)
, the symbol usually happens to be left out, sinceclang
defaults to compiling for the host macOS version, and thus things seem to work - but the availability check actually compiles down to nothing, which is a huge correctness footgun for running on older OSes).(My super secret evil agenda is also to expose some variant of
@available
in Rust'sstd
after rust-lang/rfcs#3750 progresses further, will probably file an ACP for this later. But I believe this PR has value regardless of those future plans, since we'd be making C/Objective-C/Swift interop easier).Solution
Implement
__isPlatformVersionAtLeast
and__isOSVersionAtLeast
as part of the "public ABI" thatstd
exposes.This is insta-stable, in the same sense that additions to
compiler-builtins
are insta-stable, though the availability of these symbols can probably be considered a "quality of implementation" detail rather than a stable promise.I originally proposed to implement this in
compiler-builtins
, see rust-lang/compiler-builtins#794, but we discussed moving it tostd
instead (Zulip thread), which makes the implementation substantially simpler, and we avoid gnarly issues with requiring the user to linklibSystem.dylib
(sincestd
unconditionally does that).Note that this does not solve the linker errors for (pure)
#![no_std]
users, but that's probably fine, if you are using@available
to test the OS version on Apple platforms, you're likely also usingstd
(and it is still possible to work around by linkinglibclang_rt.*.a
).A thing to note about the implementation, I've choosen to stray a bit from LLVM's upstream implementation, and not use
_availability_version_check
since it has problems when compiling with an older SDK. Instead, we usesysctl kern.osproductversion
when available to still avoid the costly PList lookup in most cases, but still with a fall back to the PList lookup when that is not available (with the PList fallback being is similar to LLVM's implementation).Testing
Apple has a lot of different "modes" that they can run binaries in, which can be a bit difficult to find your bearings in, but I've tried to be as thorough as I could in testing them all.
Tested using roughly the equivalent of
./x test library/std -- platform_version
on the following configurations:aarch64-apple-darwin
x86_64-apple-darwin
(under Rosetta)aarch64-apple-ios-macabi
x86_64-apple-ios-macabi
(under Rosetta)aarch64-apple-ios
(using Xcode's "Designed for iPad" setting)aarch64-apple-ios-sim
(in iOS Simulator, as iPhone with iOS 17.5)aarch64-apple-ios-sim
(in iOS Simulator, as iPad with iOS 18.2)aarch64-apple-tvos-sim
(in tvOS Simulator)aarch64-apple-watchos-sim
(in watchOS Simulator)aarch64-apple-ios-sim
(in visionOS simulator, using Xcode's "Designed for iPad" setting)aarch64-apple-visionos-sim
(in visionOS Simulator)aarch64-apple-darwin
aarch64-apple-ios-macabi
x86_64-apple-darwin
i686-apple-darwin
x86_64-apple-ios
(in iOS Simulator)armv7-apple-ios
with an older compilerAlong with manually inspecting the output of
version_from_sysctl()
andversion_from_plist()
, and verifying that they actually match what's expected.I believe the only real omissions here would be:
aarch64-apple-ios
on a newer iPhone that hassysctl
available (iOS 11.4 or above).aarch64-apple-ios
on a Vision Pro using Xcode's "Designed for iPad" setting.But I don't have the hardware available to test those.
@rustbot label O-apple A-linkage -T-compiler -A-meta -A-run-make
try-run: apple